From 1aebb62ce84eb3810dc38c2b419d9c969d55a8bb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 14 Nov 2000 21:57:23 +0000 Subject: [PATCH] Remove, useless. A distribution already has a built gtkcompat.h. 2000-11-14 Tor Lillqvist * gtk/gtkcompat.h.win32: Remove, useless. A distribution already has a built gtkcompat.h. Developers using CVS code on Win32 can hand-edit it from gtkcompat.h.in. * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make gtkcompat.h from gtkcompat.h.win32. --- ChangeLog | 9 ++++ ChangeLog.pre-2-0 | 9 ++++ ChangeLog.pre-2-10 | 9 ++++ ChangeLog.pre-2-2 | 9 ++++ ChangeLog.pre-2-4 | 9 ++++ ChangeLog.pre-2-6 | 9 ++++ ChangeLog.pre-2-8 | 9 ++++ gtk/gtkcompat.h.win32 | 105 ------------------------------------------ gtk/makefile.mingw.in | 4 -- gtk/makefile.msc.in | 4 -- 10 files changed, 63 insertions(+), 113 deletions(-) delete mode 100644 gtk/gtkcompat.h.win32 diff --git a/ChangeLog b/ChangeLog index eaf4432e6c..e46361b218 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2000-11-14 Tor Lillqvist + + * gtk/gtkcompat.h.win32: Remove, useless. A distribution already + has a built gtkcompat.h. Developers using CVS code on Win32 can + hand-edit it from gtkcompat.h.in. + + * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make + gtkcompat.h from gtkcompat.h.win32. + 2000-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_drag_motion): Fix drag-and-drop diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index eaf4432e6c..e46361b218 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2000-11-14 Tor Lillqvist + + * gtk/gtkcompat.h.win32: Remove, useless. A distribution already + has a built gtkcompat.h. Developers using CVS code on Win32 can + hand-edit it from gtkcompat.h.in. + + * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make + gtkcompat.h from gtkcompat.h.win32. + 2000-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_drag_motion): Fix drag-and-drop diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index eaf4432e6c..e46361b218 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2000-11-14 Tor Lillqvist + + * gtk/gtkcompat.h.win32: Remove, useless. A distribution already + has a built gtkcompat.h. Developers using CVS code on Win32 can + hand-edit it from gtkcompat.h.in. + + * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make + gtkcompat.h from gtkcompat.h.win32. + 2000-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_drag_motion): Fix drag-and-drop diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index eaf4432e6c..e46361b218 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2000-11-14 Tor Lillqvist + + * gtk/gtkcompat.h.win32: Remove, useless. A distribution already + has a built gtkcompat.h. Developers using CVS code on Win32 can + hand-edit it from gtkcompat.h.in. + + * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make + gtkcompat.h from gtkcompat.h.win32. + 2000-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_drag_motion): Fix drag-and-drop diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index eaf4432e6c..e46361b218 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2000-11-14 Tor Lillqvist + + * gtk/gtkcompat.h.win32: Remove, useless. A distribution already + has a built gtkcompat.h. Developers using CVS code on Win32 can + hand-edit it from gtkcompat.h.in. + + * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make + gtkcompat.h from gtkcompat.h.win32. + 2000-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_drag_motion): Fix drag-and-drop diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index eaf4432e6c..e46361b218 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2000-11-14 Tor Lillqvist + + * gtk/gtkcompat.h.win32: Remove, useless. A distribution already + has a built gtkcompat.h. Developers using CVS code on Win32 can + hand-edit it from gtkcompat.h.in. + + * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make + gtkcompat.h from gtkcompat.h.win32. + 2000-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_drag_motion): Fix drag-and-drop diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index eaf4432e6c..e46361b218 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2000-11-14 Tor Lillqvist + + * gtk/gtkcompat.h.win32: Remove, useless. A distribution already + has a built gtkcompat.h. Developers using CVS code on Win32 can + hand-edit it from gtkcompat.h.in. + + * gtk/makefile.{mingw,msc}.in: Correspondingly don't try to make + gtkcompat.h from gtkcompat.h.win32. + 2000-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_drag_motion): Fix drag-and-drop diff --git a/gtk/gtkcompat.h.win32 b/gtk/gtkcompat.h.win32 deleted file mode 100644 index 6a176c9176..0000000000 --- a/gtk/gtkcompat.h.win32 +++ /dev/null @@ -1,105 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_COMPAT_H__ -#define __GTK_COMPAT_H__ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -/* compile time version - */ -#define GTK_MAJOR_VERSION (1) -#define GTK_MINOR_VERSION (3) -#define GTK_MICRO_VERSION (0) -#define GTK_BINARY_AGE (0) -#define GTK_INTERFACE_AGE (0) - -/* check whether a Gtk+ version equal to or greater than - * major.minor.micro is present. - */ -#define GTK_CHECK_VERSION(major,minor,micro) \ - (GTK_MAJOR_VERSION > (major) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \ - GTK_MICRO_VERSION >= (micro))) - - -/* use -DGTK_DISABLE_COMPAT_H to compile your code and asure that it - * works with future Gtk+ versions as well. - */ -#ifndef GTK_DISABLE_COMPAT_H - -/* the following are aliases that have to be kept for historical - * reasons, because a wide code base depends on them. it is not - * recommended to actually make use of these definitions. - */ -#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width -#define gtk_container_border_width gtk_container_set_border_width -#define gtk_notebook_current_page gtk_notebook_get_current_page -#define gtk_packer_configure gtk_packer_set_child_packing -#define gtk_paned_gutter_size gtk_paned_set_gutter_size -#define gtk_paned_handle_size gtk_paned_set_handle_size -#define gtk_scale_value_width gtk_scale_get_value_width -#define gtk_window_position gtk_window_set_position -#define gtk_toggle_button_set_state gtk_toggle_button_set_active -#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active - - -/* strongly deprecated, very likely to be removed in the future: - */ -#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r)) -#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h) -#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1 -#define GTK_HAVE_SIGNAL_INIT 1-0-2 -#define GTK_HAVE_FEATURES_1_1_0 1-1-0 -#define GTK_HAVE_FEATURES_1_1_2 1-1-2 -#define GTK_HAVE_FEATURES_1_1_4 1-1-4 -#define GTK_HAVE_FEATURES_1_1_5 1-1-5 -#define GTK_HAVE_FEATURES_1_1_6 1-1-6 -#define GTK_HAVE_FEATURES_1_1_7 1-1-7 -#define GTK_HAVE_FEATURES_1_1_8 1-1-8 -#define GTK_HAVE_FEATURES_1_1_9 1-1-9 -#define GTK_HAVE_FEATURES_1_1_10 1-1-10 -#define GTK_HAVE_FEATURES_1_1_11 1-1-11 -#define GTK_HAVE_FEATURES_1_1_12 1-1-12 -#define GTK_HAVE_FEATURES_1_1_13 1-1-13 -#define GTK_HAVE_FEATURES_1_1_14 1-1-14 - - -#endif /* GTK_DISABLE_COMPAT_H */ - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GTK_COMPAT_H__ */ diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in index 050adc2863..54a5ee6875 100644 --- a/gtk/makefile.mingw.in +++ b/gtk/makefile.mingw.in @@ -38,7 +38,6 @@ DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_ all : \ ../config.h \ - gtkcompat.h \ generated \ gtk-win32-$(GTK_VER).dll \ testcalendar.exe \ @@ -348,9 +347,6 @@ gdk_headers = \ ../config.h : ../config.h.win32 cp $< $@ -gtkcompat.h : gtkcompat.h.win32 - cp $< $@ - GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c # diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index f641aed7f9..3e46a4a117 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -35,7 +35,6 @@ GTK_VER=1.3 all : \ ..\config.h \ - gtkcompat.h \ generated \ gtk-win32-$(GTK_VER).dll \ testcalendar.exe \ @@ -345,9 +344,6 @@ gdk_headers = \ ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h -gtkcompat.h : gtkcompat.h.win32 - copy gtkcompat.h.win32 gtkcompat.h - GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c # -- 2.30.2